Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 9 Jan 2016 20:57:49 +0000 (21:57 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 9 Jan 2016 20:57:49 +0000 (21:57 +0100)

Trivial merge